Bump object and thorin-dwp #111413

workingjubilee · 2023-05-10T03:35:22Z

Required to fix watchOS breakage.

rustbot · 2023-05-10T03:35:28Z

(rustbot has picked a reviewer for you, use r? to override)

rustbot · 2023-05-10T03:35:31Z

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

Hey! It looks like you've submitted a new PR for the library teams!

If this PR contains changes to any rust-lang/rust public library APIs then please comment with @rustbot label +T-libs-api -T-libs to tag it appropriately. If this PR contains changes to any unstable APIs please edit the PR description to add a link to the relevant API Change Proposal or create one if you haven't already. If you're unsure where your change falls no worries, just leave it as is and the reviewer will take a look and make a decision to forward on if necessary.

Examples of T-libs-api changes:

Stabilizing library features
Introducing insta-stable changes such as new implementations of existing stable traits on existing stable types
Introducing new or changing existing unstable library APIs (excluding permanently unstable features / features without a tracking issue)
Changing public documentation in ways that create new stability guarantees
Changing observable runtime behavior of library APIs

workingjubilee · 2023-05-10T03:36:10Z

cc @vladimir-ea

KamilaBorowska · 2023-05-10T06:16:48Z

Cargo.lock

@@ -4621,7 +4648,7 @@ dependencies = [
 "hermit-abi 0.3.0",
 "libc",
 "miniz_oxide",
- "object",
+ "object 0.30.3",


Is depending on old version of object for std intentional?

Yes, it's pointless to bump this unless backtrace is updated first.

klensy · 2023-05-10T06:50:16Z

There also exist #111384(or maybe one more?) with same bump, so need to coordinate.

Cargo.lock

petrochenkov · 2023-05-10T15:09:27Z

Does this PR contain all the version updates that #111384 needs?
If yes, then I'll block that PR on this one.

workingjubilee · 2023-05-11T04:01:16Z

@petrochenkov Yes, that PR is now effectively a superset of this one on all points that matter.

object -> 0.31.1 thorin-dwp -> 0.6.0 Required to fix watchOS breakage.

Mark-Simulacrum · 2023-05-18T01:43:19Z

r=me when ready

imWildCat · 2023-05-18T03:30:18Z

@Mark-Simulacrum sorry to jump into this thread.

No sure but #111384 seems to already contain changes in this PR.

workingjubilee · 2023-05-20T09:14:01Z

Is ready, yes.

@bors r=MarkSimulacrum

bors · 2023-05-20T09:14:03Z

📌 Commit 7156ff6 has been approved by MarkSimulacrum

It is now in the queue for this repository.

workingjubilee · 2023-05-20T09:16:48Z

@imWildCat It is the reviewer's intention to delay approving that PR until after this one is merged so we might as well get on with this one.

bors · 2023-05-20T13:19:40Z

⌛ Testing commit 7156ff6 with merge 4eb5225...

bors · 2023-05-20T16:07:48Z

☀️ Test successful - checks-actions
Approved by: MarkSimulacrum
Pushing 4eb5225 to master...

imWildCat · 2023-05-20T16:39:23Z

@workingjubilee understand. Thank you!

bmisiak · 2023-05-20T16:41:13Z

Excellent! I’ll rebase #111384 on top of this.

rust-timer · 2023-05-20T18:24:19Z

Finished benchmarking commit (4eb5225): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	0.5%	[0.5%, 0.5%]	2
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.5%	[0.5%, 0.5%]	2

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	3.2%	[3.1%, 3.4%]	2
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 642.109s -> 645.683s (0.56%)

workingjubilee · 2023-05-22T23:12:18Z

I know no action was called for, but regarding the perf and 3.5 second bootstrap regression:

0.7 of these seconds is the object crate.

Some of this is inevitable complication. However, with the enabling of compression features in object, it is possible that either object or thorin-dwp are including (thus, compiling) more code than Rust actually uses now, due to the use of compression by default. This could be fixed if thorin-dwp allowed forwarding features so we could disable the compression. However, it is likely we want to instead make more deliberate use of that compression somehow.

workingjubilee · 2023-05-22T23:13:42Z

also: Is await-call-tree normally a bouncy benchmark? The wall-time massively improved on that.

…henkov Fix linking Mac Catalyst by including LC_BUILD_VERSION in object files Hello. My first rustc PR! Issue rust-lang#106021 prevents Rust code from being linked into Mac Catalyst applications. Apple's LD has started requiring object files to contain version information about the platform they were built for, such as: * the "deployment target" (minimum supported OS version), * the SDK version * the type of the platform (macOS/iOS/catalyst/tvOS/watchOS all have a different number). This is currently only enforced when building for Mac Catalyst. Rust uses the `object` crate which added support for including this information starting with `0.31.0`. ~~I upgraded it along with `thorin-dwp` so that everything depends on 0.31. Apparently 0.31 [pulls in](gimli-rs/object#463) `ruzstd` due to a [new ELF standard](https://maskray.me/blog/2022-09-09-zstd-compressed-debug-sections) because its `compression` feature is enabled by thorin. If you find this objectionable, let me know what the best way to avoid pulling in those dependencies might be.~~ **(`object` upgraded in rust-lang#111413 I then added two commits: * The first one adds very basic, hard-coded support for calling `set_macho_build_version` for `-macabi` (Catalyst) targets, where it claims deployment target of Catalyst 14.0 and SDK of 16.2. * The second weaves the versioning through `rust_target::spec::TargetOptions`, so that we can stick to specifying all target-related info in one place. Kudos to `@ara4n` for writing [this gist](https://gist.github.com/ara4n/320a53ea768aba51afad4c9ed2168536).

…henkov Fix linking Mac Catalyst by including LC_BUILD_VERSION in object files Hello. My first rustc PR! Issue rust-lang#106021 prevents Rust code from being linked into Mac Catalyst applications. Apple's LD has started requiring object files to contain version information about the platform they were built for, such as: * the "deployment target" (minimum supported OS version), * the SDK version * the type of the platform (macOS/iOS/catalyst/tvOS/watchOS all have a different number). This is currently only enforced when building for Mac Catalyst. Rust uses the `object` crate which added support for including this information starting with `0.31.0`. ~~I upgraded it along with `thorin-dwp` so that everything depends on 0.31. Apparently 0.31 [pulls in](gimli-rs/object#463) `ruzstd` due to a [new ELF standard](https://maskray.me/blog/2022-09-09-zstd-compressed-debug-sections) because its `compression` feature is enabled by thorin. If you find this objectionable, let me know what the best way to avoid pulling in those dependencies might be.~~ **(`object` upgraded in rust-lang#111413 I then added two commits: * The first one adds very basic, hard-coded support for calling `set_macho_build_version` for `-macabi` (Catalyst) targets, where it claims deployment target of Catalyst 14.0 and SDK of 16.2. * The second weaves the versioning through `rust_target::spec::TargetOptions`, so that we can stick to specifying all target-related info in one place. Kudos to ``@ara4n`` for writing [this gist](https://gist.github.com/ara4n/320a53ea768aba51afad4c9ed2168536).

Use constants from object crate Replace hard-coded values with `GNU_PROPERTY_{X86|AARCH64}_FEATURE_1_AND` from the object crate. When working on [issue](rust-lang#103001) it was suggested that we moved these constants to the object crate . [PR](gimli-rs/object#537). Now that that the object crate has been updated [PR](rust-lang#111413) we can make this change.

rustbot assigned Mark-Simulacrum May 10, 2023

This comment has been minimized.

Sign in to view

workingjubilee force-pushed the bump-object-0-31-1 branch from ae6910d to 5b00a88 Compare May 10, 2023 04:10

This comment has been minimized.

Sign in to view

workingjubilee force-pushed the bump-object-0-31-1 branch from 5b00a88 to 7ebfe9e Compare May 10, 2023 05:09

This comment has been minimized.

Sign in to view

workingjubilee force-pushed the bump-object-0-31-1 branch from 7ebfe9e to 325483c Compare May 10, 2023 06:02

rustbot added the A-testsuite Area: The testsuite used to check the correctness of rustc label May 10, 2023

KamilaBorowska reviewed May 10, 2023

View reviewed changes

klensy reviewed May 10, 2023

View reviewed changes

Cargo.lock Outdated Show resolved Hide resolved

workingjubilee mentioned this pull request May 10, 2023

Fix linking Mac Catalyst by including LC_BUILD_VERSION in object files #111384

Merged

vladimir-ea mentioned this pull request May 10, 2023

[watchos] Fix broken target arm64_32-apple-watchos #111267

Closed

workingjubilee changed the title ~~Bump object to 0.31.1~~ Bump object and thorin-dwp May 11, 2023

Bump object and thorin-dwp

7156ff6

object -> 0.31.1 thorin-dwp -> 0.6.0 Required to fix watchOS breakage.

workingjubilee force-pushed the bump-object-0-31-1 branch from 325483c to 7156ff6 Compare May 11, 2023 04:36

This was referenced May 11, 2023

Support the rustc metadata for AIX #107583

Merged

Add GNU Property Types gimli-rs/object#537

Merged

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 20, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label May 20, 2023

bors merged commit 4eb5225 into rust-lang:master May 20, 2023

rustbot added this to the 1.71.0 milestone May 20, 2023

workingjubilee mentioned this pull request May 30, 2023

Unable to build for arm64_32-apple-watchos #111217

Closed

cchiw mentioned this pull request Jul 11, 2023

Use constants from object crate #113595

Merged

workingjubilee deleted the bump-object-0-31-1 branch July 12, 2023 03:40

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bump object and thorin-dwp #111413

Bump object and thorin-dwp #111413

workingjubilee commented May 10, 2023

rustbot commented May 10, 2023

rustbot commented May 10, 2023

workingjubilee commented May 10, 2023

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

KamilaBorowska May 10, 2023

workingjubilee May 10, 2023

klensy commented May 10, 2023

petrochenkov commented May 10, 2023

workingjubilee commented May 11, 2023

Mark-Simulacrum commented May 18, 2023

imWildCat commented May 18, 2023

workingjubilee commented May 20, 2023

bors commented May 20, 2023

workingjubilee commented May 20, 2023

bors commented May 20, 2023

bors commented May 20, 2023

imWildCat commented May 20, 2023

bmisiak commented May 20, 2023

rust-timer commented May 20, 2023

workingjubilee commented May 22, 2023

workingjubilee commented May 22, 2023

Bump object and thorin-dwp #111413

Bump object and thorin-dwp #111413

Conversation

workingjubilee commented May 10, 2023

rustbot commented May 10, 2023

rustbot commented May 10, 2023

workingjubilee commented May 10, 2023

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

KamilaBorowska May 10, 2023

Choose a reason for hiding this comment

workingjubilee May 10, 2023

Choose a reason for hiding this comment

klensy commented May 10, 2023

petrochenkov commented May 10, 2023

workingjubilee commented May 11, 2023

Mark-Simulacrum commented May 18, 2023

imWildCat commented May 18, 2023

workingjubilee commented May 20, 2023

bors commented May 20, 2023

workingjubilee commented May 20, 2023

bors commented May 20, 2023

bors commented May 20, 2023

imWildCat commented May 20, 2023

bmisiak commented May 20, 2023

rust-timer commented May 20, 2023

Overall result: ❌ regressions - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

workingjubilee commented May 22, 2023

workingjubilee commented May 22, 2023